Install a shared library

This required a fair bit of surgery because previously ostree.h
included otutil.h, but that's supposed to be a private library.

diff --git a/Makefile-libostree.am b/Makefile-libostree.am
index 28e5fecf5ed25c9ce5b598bf434ac05d86442b1f..2e799f208b0b0621721c4096647c83c2306806cd 100644 (file)
--- a/Makefile-libostree.am
+++ b/Makefile-libostree.am
@@ -17,59 +17,78 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-privlib_LTLIBRARIES += libostree.la
+lib_LTLIBRARIES += libostree-1.la
 
-libostree_la_SOURCES = src/libostree/ostree.h \
-       src/libostree/ostree-core.c \
+libostreeheadersdir = $(includedir)/ostree-1
+libostreeheaders_DATA = \
+       src/libostree/ostree.h \
        src/libostree/ostree-core.h \
+       src/libostree/ostree-mutable-tree.h \
+       src/libostree/ostree-repo.h \
+       src/libostree/ostree-types.h \
+       src/libostree/ostree-repo-file.h \
+       src/libostree/ostree-diff.h \
+       $(NULL)
+
+libostree_1_la_SOURCES = \
+       src/libostree/ostree-core.c \
        src/libostree/ostree-checksum-input-stream.c \
        src/libostree/ostree-checksum-input-stream.h \
        src/libostree/ostree-chain-input-stream.c \
        src/libostree/ostree-chain-input-stream.h \
        src/libostree/ostree-diff.c \
-       src/libostree/ostree-diff.h \
        src/libostree/ostree-mutable-tree.c \
-       src/libostree/ostree-mutable-tree.h \
        src/libostree/ostree-repo.c \
        src/libostree/ostree-repo-checkout.c \
        src/libostree/ostree-repo-libarchive.c \
        src/libostree/ostree-repo-prune.c \
        src/libostree/ostree-repo-refs.c \
        src/libostree/ostree-repo-traverse.c \
-       src/libostree/ostree-repo.h \
        src/libostree/ostree-repo-private.h \
        src/libostree/ostree-repo-file.c \
-       src/libostree/ostree-repo-file.h \
        src/libostree/ostree-repo-file-enumerator.c \
        src/libostree/ostree-repo-file-enumerator.h \
-       src/libostree/ostree-types.h \
        $(NULL)
 if USE_LIBARCHIVE
-libostree_la_SOURCES += src/libostree/ostree-libarchive-input-stream.h \
+libostree_1_la_SOURCES += src/libostree/ostree-libarchive-input-stream.h \
        src/libostree/ostree-libarchive-input-stream.c \
        $(NULL)
 endif
 
-libostree_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src/libgsystem -I$(srcdir)/src/libotutil -I$(srcdir)/src/libostree -DLOCALEDIR=\"$(datadir)/locale\" $(OT_INTERNAL_GIO_UNIX_CFLAGS)
-libostree_la_LDFLAGS = -avoid-version -Bsymbolic-functions -export-symbols-regex '^ostree_'
-libostree_la_LIBADD = libotutil.la $(OT_INTERNAL_GIO_UNIX_LIBS)
+libostree_1_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src/libgsystem -I$(srcdir)/src/libotutil -I$(srcdir)/src/libostree -DLOCALEDIR=\"$(datadir)/locale\" $(OT_INTERNAL_GIO_UNIX_CFLAGS)
+libostree_1_la_LDFLAGS = -version-number 1:0:0 -Bsymbolic-functions -export-symbols-regex '^ostree_'
+libostree_1_la_LIBADD = libotutil.la $(OT_INTERNAL_GIO_UNIX_LIBS)
 
 if USE_LIBARCHIVE
-libostree_la_CFLAGS += $(OT_DEP_LIBARCHIVE_CFLAGS)
-libostree_la_LIBADD += $(OT_DEP_LIBARCHIVE_LIBS)
+libostree_1_la_CFLAGS += $(OT_DEP_LIBARCHIVE_CFLAGS)
+libostree_1_la_LIBADD += $(OT_DEP_LIBARCHIVE_LIBS)
 endif
 
 if USE_LIBSOUP
-libostree_la_SOURCES += \
+libostree_1_la_SOURCES += \
        src/libostree/ostree-fetcher.h \
        src/libostree/ostree-fetcher.c \
        src/libostree/ostree-repo-pull.c \
        $(NULL)
-libostree_la_CFLAGS += $(OT_INTERNAL_SOUP_CFLAGS)
-libostree_la_LIBADD += $(OT_INTERNAL_SOUP_LIBS)
+libostree_1_la_CFLAGS += $(OT_INTERNAL_SOUP_CFLAGS)
+libostree_1_la_LIBADD += $(OT_INTERNAL_SOUP_LIBS)
+endif
+
+if BUILDOPT_INTROSPECTION
+OSTree-1.0.gir: libostree-1.la Makefile
+OSTree_1_0_gir_EXPORT_PACKAGES = ostree-1
+OSTree_1_0_gir_INCLUDES = Gio-2.0
+OSTree_1_0_gir_CFLAGS = $(libostree_1_la_CFLAGS)
+OSTree_1_0_gir_LIBS = libostree-1.la
+OSTree_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=Ostree --symbol-prefix=ostree
+OSTree_1_0_gir_FILES = $(libostreeheaders_DATA) $(filter-out %-private.h,$(libostree_1_la_SOURCES))
+INTROSPECTION_GIRS += OSTree-1.0.gir
+gir_DATA += OSTree-1.0.gir
+typelib_DATA += OSTree-1.0.typelib
 endif
 
+pkgconfig_DATA += src/libostree/ostree-1.pc
 
 INSTALL_DATA_HOOKS += install-libostree-data-hook
 install-libostree-data-hook: 
-       rm -f $(DESTDIR)$(privlibdir)/libostree.la
+       rm -f $(DESTDIR)$(libdir)/libostree-1.la

diff --git a/Makefile-ostree.am b/Makefile-ostree.am
index ee49c38e4830d8081e490a6aed19cafe44e6ef88..d2e3be62ee183c9fbb22592c82acb5457482c45f 100644 (file)
--- a/Makefile-ostree.am
+++ b/Makefile-ostree.am
@@ -72,7 +72,7 @@ ostree_SOURCES += \
        $(NULL)
 
 ostree_bin_shared_cflags = $(AM_CFLAGS) -I$(srcdir)/src/libgsystem -I$(srcdir)/src/libotutil -I$(srcdir)/src/libostree -I$(srcdir)/src/ostree  -DLOCALEDIR=\"$(datadir)/locale\"
-ostree_bin_shared_ldadd = libotutil.la libostree.la
+ostree_bin_shared_ldadd = libotutil.la libostree-1.la
 
 ostree_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_GIO_UNIX_CFLAGS)
 ostree_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_GIO_UNIX_LIBS)

diff --git a/Makefile.am b/Makefile.am
index b87ecb3b52aaca41b8f7f14c2bdd92e75defe5df..dda09e23e0988440f1dff3b02c476d2032cff0e7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,11 +37,19 @@ EXTRA_DIST =
 bin_PROGRAMS =
 sbin_PROGRAMS =
 bin_SCRIPTS =
+lib_LTLIBRARIES =
 libexec_PROGRAMS =
 noinst_LTLIBRARIES =
 noinst_PROGRAMS =
 privlibdir = $(pkglibdir)
 privlib_LTLIBRARIES =
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA =
+INTROSPECTION_GIRS = 
+girdir = $(datadir)/gir-1.0
+gir_DATA =
+typelibdir = $(libdir)/girepository-1.0
+typelib_DATA =
 
 EXTRA_DIST += autogen.sh COPYING.GPL COPYING.LGPL README.md
 
@@ -78,6 +86,14 @@ libgsystem_cflags = $(OT_INTERNAL_GIO_UNIX_CFLAGS) -I$(srcdir)/src/libgsystem
 libgsystem_libs = $(OT_INTERNAL_GIO_UNIX_LIBS)
 include src/libgsystem/Makefile-libgsystem.am
 noinst_LTLIBRARIES += libgsystem.la
+
+
+if BUILDOPT_INTROSPECTION
+include $(INTROSPECTION_MAKEFILE)
+GIRS =
+TYPELIBS = $(GIRS:.gir=.typelib)
+endif
+
 include Makefile-otutil.am
 include Makefile-libostree.am
 include Makefile-ostree.am

diff --git a/configure.ac b/configure.ac
index f0c57fa8609e5edd11c682187c817484c0e73a38..675f76ecbb30605041e6db764ade39ccc5d0e884 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -76,6 +76,11 @@ AS_IF([test x$enable_embedded_dependencies = xyes], [
 if test x$with_soup != xno; then OSTREE_FEATURES="$OSTREE_FEATURES +libsoup"; fi
 AM_CONDITIONAL(USE_LIBSOUP, test x$with_soup != xno)
 
+m4_ifdef([GOBJECT_INTROSPECTION_CHECK], [
+  GOBJECT_INTROSPECTION_CHECK([1.34.0])
+])
+AM_CONDITIONAL(BUILDOPT_INTROSPECTION, test x$found_introspection = xyes)
+
 LIBARCHIVE_DEPENDENCY="libarchive >= 2.8.0"
 
 AC_ARG_ENABLE(documentation,
@@ -121,6 +126,7 @@ AM_CONDITIONAL(BUILDOPT_DRACUT, test x$with_dracut = xyes)
 AC_CONFIG_FILES([
 Makefile
 embedded-dependencies/Makefile
+src/libostree/ostree-1.pc
 ])
 AC_OUTPUT
 
@@ -130,6 +136,7 @@ echo "
 
 
     embedded dependencies: $enable_embedded_dependencies
+    introspection: $found_introspection
     libsoup (retrieve remote HTTP repositories): $with_soup
     libarchive (parse tar files directly): $with_libarchive
     documentation: $enable_documentation

diff --git a/src/libostree/ostree-1.pc.in b/src/libostree/ostree-1.pc.in
new file mode 100644 (file)
index 0000000..d777c59
--- /dev/null
+++ b/src/libostree/ostree-1.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: OSTree
+Description: Git for operating system binaries
+Version: @VERSION@
+Requires: gio-unix-2.0
+Libs: -L${libdir} -lostree-1
+Cflags: -I${includedir}/ostree-1

diff --git a/src/libostree/ostree-chain-input-stream.c b/src/libostree/ostree-chain-input-stream.c
index fa00e3740d46f146e4c1e3043e02aa77d7f5d639..846029613e08a17876af334d0a7838d6e0ca1ff6 100644 (file)
--- a/src/libostree/ostree-chain-input-stream.c
+++ b/src/libostree/ostree-chain-input-stream.c
@@ -20,9 +20,8 @@
 
 #include "config.h"
 
-
-#include <gio/gio.h>
 #include "ostree-chain-input-stream.h"
+#include "libgsystem.h"
 
 enum {
   PROP_0,

diff --git a/src/libostree/ostree-checksum-input-stream.c b/src/libostree/ostree-checksum-input-stream.c
index ef5f0d4a1471007db4bcf82ece7e0b6fae8cd5ee..27218e8b8ce663b1d4f8d6bae40caa0ad61f51d3 100644 (file)
--- a/src/libostree/ostree-checksum-input-stream.c
+++ b/src/libostree/ostree-checksum-input-stream.c
@@ -20,9 +20,8 @@
 
 #include "config.h"
 
-
-#include <gio/gio.h>
 #include "ostree-checksum-input-stream.h"
+#include "libgsystem.h"
 
 enum {
   PROP_0,

diff --git a/src/libostree/ostree-core.c b/src/libostree/ostree-core.c
index 8a989373e2a9cbd98ad21be8dbb7730e7cb6e442..1a1b396f42ebe9f96e3403ad3d80e004f3b5c3ae 100644 (file)
--- a/src/libostree/ostree-core.c
+++ b/src/libostree/ostree-core.c
@@ -22,15 +22,15 @@
 
 #include "config.h"
 
-#include "ostree.h"
-#include "otutil.h"
-
-#include <gio/gfiledescriptorbased.h>
-
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <gio/gfiledescriptorbased.h>
 #include <attr/xattr.h>
+#include "ostree.h"
+#include "ostree-chain-input-stream.h"
+#include "otutil.h"
+#include "libgsystem.h"
 
 #define ALIGN_VALUE(this, boundary) \
   (( ((unsigned long)(this)) + (((unsigned long)(boundary)) -1)) & (~(((unsigned long)(boundary))-1)))

diff --git a/src/libostree/ostree-core.h b/src/libostree/ostree-core.h
index c94025078e82b3d0e7b50d8f0ec712bb76de034d..7a78e1abaa36fffdbe27cdb9820b218089d8b6b4 100644 (file)
--- a/src/libostree/ostree-core.h
+++ b/src/libostree/ostree-core.h
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <otutil.h>
+#include <gio/gio.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/libostree/ostree-diff.c b/src/libostree/ostree-diff.c
index 560ac808f47b03ae9dd798501ee8d566f4f4c2f9..9cd59942cd1aee1ada90faeb40f1543860b02509 100644 (file)
--- a/src/libostree/ostree-diff.c
+++ b/src/libostree/ostree-diff.c
@@ -24,6 +24,7 @@
 
 #include "ostree.h"
 #include "otutil.h"
+#include "libgsystem.h"
 
 static gboolean
 get_file_checksum (GFile  *f,

diff --git a/src/libostree/ostree-fetcher.c b/src/libostree/ostree-fetcher.c
index 22624674f7457dfa89b55443f69657376c7c38a4..f330150c7fa4a083a46e6f274770b1b134527e92 100644 (file)
--- a/src/libostree/ostree-fetcher.c
+++ b/src/libostree/ostree-fetcher.c
@@ -24,6 +24,8 @@
 
 #include "ostree-fetcher.h"
 #include "ostree.h"
+#include "otutil.h"
+#include "libgsystem.h"
 
 typedef enum {
   OSTREE_FETCHER_STATE_PENDING,

diff --git a/src/libostree/ostree-libarchive-input-stream.c b/src/libostree/ostree-libarchive-input-stream.c
index f27a7a01ff05210221656adc4b6674dd51ed4bce..701591e8dad7912802eb5e96432327c56ce63337 100644 (file)
--- a/src/libostree/ostree-libarchive-input-stream.c
+++ b/src/libostree/ostree-libarchive-input-stream.c
@@ -24,6 +24,7 @@
 #include <archive.h>
 #include <gio/gio.h>
 #include "ostree-libarchive-input-stream.h"
+#include "libgsystem.h"
 
 enum {
   PROP_0,

diff --git a/src/libostree/ostree-mutable-tree.c b/src/libostree/ostree-mutable-tree.c
index 95f17a5aa65364eefa1251a2914ffda90ee2593f..edbe4f655ff5c96ab94fe4d54c30fff0826046c6 100644 (file)
--- a/src/libostree/ostree-mutable-tree.c
+++ b/src/libostree/ostree-mutable-tree.c
@@ -25,6 +25,7 @@
 #include "ostree-mutable-tree.h"
 #include "otutil.h"
 #include "ostree-core.h"
+#include "libgsystem.h"
 
 struct OstreeMutableTree
 {

diff --git a/src/libostree/ostree-repo-checkout.c b/src/libostree/ostree-repo-checkout.c
index e40c8d594d0b8cec358867070278deab967171e1..63f54d356cf5c4caa18998e2ac21b515b58085d1 100644 (file)
--- a/src/libostree/ostree-repo-checkout.c
+++ b/src/libostree/ostree-repo-checkout.c
@@ -22,6 +22,9 @@
 
 #include "config.h"
 
+#include <glib-unix.h>
+#include "otutil.h"
+
 #include "ostree-repo-file.h"
 #include "ostree-repo-private.h"
 

diff --git a/src/libostree/ostree-repo-file-enumerator.c b/src/libostree/ostree-repo-file-enumerator.c
index 7f25ec6d39c89d0f67b9986872cb37f23df28cc5..15f935c428f400222cb95197788388ac13c80317 100644 (file)
--- a/src/libostree/ostree-repo-file-enumerator.c
+++ b/src/libostree/ostree-repo-file-enumerator.c
@@ -22,6 +22,7 @@
 
 #include "config.h"
 
+#include "libgsystem.h"
 #include "ostree-repo-file-enumerator.h"
 #include <string.h>
 

diff --git a/src/libostree/ostree-repo-file.c b/src/libostree/ostree-repo-file.c
index ad2b7f369b39d8c6681984912156605f1d3a0708..c80b529d8c37c111eb8de72a0afc3a835a0340be 100644 (file)
--- a/src/libostree/ostree-repo-file.c
+++ b/src/libostree/ostree-repo-file.c
@@ -22,6 +22,7 @@
 
 #include "config.h"
 
+#include "otutil.h"
 #include "ostree-repo-file-enumerator.h"
 #include "ostree-repo.h"
 

diff --git a/src/libostree/ostree-repo-libarchive.c b/src/libostree/ostree-repo-libarchive.c
index 3c23af09d4b322525b00257b10b9b99a8100a6ae..e06092a44a70a8eb05a73f983023e9eede3d9e68 100644 (file)
--- a/src/libostree/ostree-repo-libarchive.c
+++ b/src/libostree/ostree-repo-libarchive.c
@@ -31,6 +31,8 @@
 #include "ostree-libarchive-input-stream.h"
 #endif
 
+#include "otutil.h"
+
 #ifdef HAVE_LIBARCHIVE
 
 static GFileInfo *

diff --git a/src/libostree/ostree-repo-prune.c b/src/libostree/ostree-repo-prune.c
index 5260e33fce731063a2ab5fec0e8f394edd2447db..19651026db52c64cdfc176904e0e459c81f7b79b 100644 (file)
--- a/src/libostree/ostree-repo-prune.c
+++ b/src/libostree/ostree-repo-prune.c
@@ -22,7 +22,8 @@
 
 #include "config.h"
 
-#include "ostree-repo.h"
+#include "ostree.h"
+#include "otutil.h"
 
 typedef struct {
   OstreeRepo *repo;

diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c
index 8837b378f2456b39cc350e98d989f6df65a71636..83ff8c08b32c2fcf811ae494f4c28428b6dd5935 100644 (file)
--- a/src/libostree/ostree-repo-pull.c
+++ b/src/libostree/ostree-repo-pull.c
@@ -69,6 +69,7 @@
 
 #include "ostree.h"
 #include "ostree-fetcher.h"
+#include "otutil.h"
 
 typedef struct {
   enum {

diff --git a/src/libostree/ostree-repo-refs.c b/src/libostree/ostree-repo-refs.c
index fb9f36188476edfb2702aeba81b0562daf6d6232..c4948a4048fefb487943d3f84a53ccdfb3b94347 100644 (file)
--- a/src/libostree/ostree-repo-refs.c
+++ b/src/libostree/ostree-repo-refs.c
@@ -23,6 +23,7 @@
 #include "config.h"
 
 #include "ostree-repo-private.h"
+#include "otutil.h"
 
 static gboolean
 add_ref_to_set (const char       *remote,
@@ -350,6 +351,17 @@ resolve_refspec (OstreeRepo     *self,
   return ret;
 }
 
+/**
+ * ostree_repo_resolve_rev:
+ * @self:
+ * @refspec: A refspec
+ * @allow_noent: Do not throw an error if refspec does not exist
+ * @out_rev: (out) (transfer full): A checksum,or %NULL if @allow_noent is true and it does not exist
+ * @error:
+ *
+ * Look up the given refspec, returning the checksum it references in
+ * the parameter @out_rev.
+ */
 gboolean
 ostree_repo_resolve_rev (OstreeRepo     *self,
                          const char     *refspec,

diff --git a/src/libostree/ostree-repo-traverse.c b/src/libostree/ostree-repo-traverse.c
index 6838314d8a109f4247e228743d3ea1115a34dd9c..7959ae2704428286245bff85944c7e04e01c21df 100644 (file)
--- a/src/libostree/ostree-repo-traverse.c
+++ b/src/libostree/ostree-repo-traverse.c
@@ -24,6 +24,7 @@
 
 #include "ostree.h"
 #include "otutil.h"
+#include "libgsystem.h"
 
 GHashTable *
 ostree_repo_traverse_new_reachable (void)

diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index fd7d33f43f5c836b545d6ecc113154fc997d0263..175e0977ee6e9e9231809d2a38d9ead974836092 100644 (file)
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -22,12 +22,6 @@
 
 #include "config.h"
 
-#include "ostree-repo-private.h"
-#include "ostree-mutable-tree.h"
-#include "ostree-checksum-input-stream.h"
-#include "otutil.h"
-#include "ostree-repo-file-enumerator.h"
-
 #include <gio/gunixoutputstream.h>
 #include <gio/gunixinputstream.h>
 #include <glib/gstdio.h>
@@ -35,6 +29,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "ostree-repo-private.h"
+#include "ostree-mutable-tree.h"
+#include "ostree-checksum-input-stream.h"
+#include "otutil.h"
+#include "libgsystem.h"
+#include "ostree-repo-file-enumerator.h"
+
 typedef struct {
   GObjectClass parent_class;
 } OstreeRepoClass;
@@ -2292,6 +2293,11 @@ ostree_repo_load_variant_if_exists (OstreeRepo       *self,
 
 /**
  * ostree_repo_load_variant:
+ * @self:
+ * @objtype: Expected object type
+ * @sha256: Checksum string
+ * @out_variant: (out): (transfer full): Metadata object
+ * @error:
  * 
  * Load the metadata object @sha256 of type @objtype, storing the
  * result in @out_variant.

diff --git a/src/libostree/ostree-repo.h b/src/libostree/ostree-repo.h
index 85a02a24ecc7f85a3c6a6e75d328d8437ceadde2..9b197becd4cd562ddfe9a29dbc7ccdfc403c5444 100644 (file)
--- a/src/libostree/ostree-repo.h
+++ b/src/libostree/ostree-repo.h
@@ -164,7 +164,7 @@ gboolean      ostree_repo_stage_content_finish (OstreeRepo        *self,
 gboolean      ostree_repo_resolve_rev (OstreeRepo  *self,
                                        const char  *refspec,
                                        gboolean     allow_noent,
-                                       char       **out_resolved,
+                                       char       **out_rev,
                                        GError     **error);
 
 gboolean      ostree_repo_write_ref (OstreeRepo  *self,

diff --git a/src/libostree/ostree.h b/src/libostree/ostree.h
index 758e45a4dffe382691c7f127b3fb4676a11d937a..efafe0d36cb9f0630b276b509e28ce95f78a53a9 100644 (file)
--- a/src/libostree/ostree.h
+++ b/src/libostree/ostree.h
@@ -22,8 +22,6 @@
 
 #pragma once
 
-#include <ostree-checksum-input-stream.h>
-#include <ostree-chain-input-stream.h>
 #include <ostree-core.h>
 #include <ostree-repo.h>
 #include <ostree-mutable-tree.h>

diff --git a/src/libotutil/otutil.h b/src/libotutil/otutil.h
index 57f32743fa7bc7e49641f4602270d84d6496e0b9..c7a2842ba7607fb7c547b3572f242f796121d0c7 100644 (file)
--- a/src/libotutil/otutil.h
+++ b/src/libotutil/otutil.h
@@ -24,6 +24,7 @@
 
 #include <gio/gio.h>
 #include <libgsystem.h>
+#include <string.h> /* Yeah...let's just do that here. */
 #include <gsystem-local-alloc.h>
 
 #define ot_gobject_refz(o) (o ? g_object_ref (o) : o)

diff --git a/src/ostree/ot-admin-builtin-cleanup.c b/src/ostree/ot-admin-builtin-cleanup.c
index 5dc8b8eaa201ef164d9b361bbd28de6599afdaa1..b8e8f302fea4cbe6430bc6a9f6d6ce0e5a39b284 100644 (file)
--- a/src/ostree/ot-admin-builtin-cleanup.c
+++ b/src/ostree/ot-admin-builtin-cleanup.c
@@ -25,6 +25,7 @@
 #include "ot-admin-builtins.h"
 #include "ot-admin-functions.h"
 #include "ostree.h"
+#include "libgsystem.h"
 
 #include <glib/gi18n.h>
 

diff --git a/src/ostree/ot-admin-builtin-deploy.c b/src/ostree/ot-admin-builtin-deploy.c
index 93e38375590ac985b418c8e177ef228bf0bff9e6..bc8dca845f1316eabb106b03e707952d9fef3e64 100644 (file)
--- a/src/ostree/ot-admin-builtin-deploy.c
+++ b/src/ostree/ot-admin-builtin-deploy.c
@@ -27,6 +27,7 @@
 #include "ot-admin-deploy.h"
 #include "ot-ordered-hash.h"
 #include "ostree.h"
+#include "otutil.h"
 
 #include <glib/gi18n.h>
 

diff --git a/src/ostree/ot-admin-builtin-diff.c b/src/ostree/ot-admin-builtin-diff.c
index 580692e3cc881cdf3b9faaecf9875bf4d23311e7..8965a3d8942d1b33b8d6e93c34f6d46dc63b6d48 100644 (file)
--- a/src/ostree/ot-admin-builtin-diff.c
+++ b/src/ostree/ot-admin-builtin-diff.c
@@ -25,6 +25,7 @@
 #include "ot-admin-builtins.h"
 #include "ot-admin-functions.h"
 #include "ostree.h"
+#include "libgsystem.h"
 
 #include <glib/gi18n.h>
 

diff --git a/src/ostree/ot-admin-builtin-init-fs.c b/src/ostree/ot-admin-builtin-init-fs.c
index 9da1e04745d27a8dde745a7f3215480691d27bd7..9b00814a497cdefe2202b49e3840922b95031b71 100644 (file)
--- a/src/ostree/ot-admin-builtin-init-fs.c
+++ b/src/ostree/ot-admin-builtin-init-fs.c
@@ -25,6 +25,7 @@
 #include "ot-admin-builtins.h"
 #include "ot-admin-functions.h"
 #include "otutil.h"
+#include "libgsystem.h"
 
 #include <glib/gi18n.h>
 

diff --git a/src/ostree/ot-admin-builtin-os-init.c b/src/ostree/ot-admin-builtin-os-init.c
index 8bdf9708aecd2e3ed009b6f4888a21e3ba5f82a3..ddb641fdf7bdaa8666070a9c95f7bfc9ebe7273a 100644 (file)
--- a/src/ostree/ot-admin-builtin-os-init.c
+++ b/src/ostree/ot-admin-builtin-os-init.c
@@ -25,6 +25,7 @@
 #include "ot-admin-builtins.h"
 #include "ot-admin-functions.h"
 #include "otutil.h"
+#include "libgsystem.h"
 
 #include <glib/gi18n.h>
 

diff --git a/src/ostree/ot-admin-builtin-status.c b/src/ostree/ot-admin-builtin-status.c
index 5f1fc34a98711ecd9a1d8f2c2f002b5d780d6af6..fe6c407f94092491420949e2c8e5367d919cf573 100644 (file)
--- a/src/ostree/ot-admin-builtin-status.c
+++ b/src/ostree/ot-admin-builtin-status.c
@@ -25,6 +25,7 @@
 #include "ot-admin-builtins.h"
 #include "ot-admin-functions.h"
 #include "ostree.h"
+#include "libgsystem.h"
 
 #include <glib/gi18n.h>
 

diff --git a/src/ostree/ot-admin-builtin-undeploy.c b/src/ostree/ot-admin-builtin-undeploy.c
index 292218907c4db509cf80b40b0ccbf9dbce70e9ad..0b5579c92b0e6327ea97fdd5b036831d20b43c93 100644 (file)
--- a/src/ostree/ot-admin-builtin-undeploy.c
+++ b/src/ostree/ot-admin-builtin-undeploy.c
@@ -20,13 +20,14 @@
 
 #include "config.h"
 
+#include <stdlib.h>
+
 #include "ot-admin-builtins.h"
 #include "ot-admin-functions.h"
 #include "ot-admin-deploy.h"
 #include "ot-ordered-hash.h"
 #include "ostree.h"
-
-#include <stdlib.h>
+#include "otutil.h"
 
 static GOptionEntry options[] = {
   { NULL }

diff --git a/src/ostree/ot-admin-builtin-upgrade.c b/src/ostree/ot-admin-builtin-upgrade.c
index b4b99815ee6b6f785c76925c87ed98a3bf53fc9f..b5b4e93d91e82bb94e79e8256dbcfb65b427b381 100644 (file)
--- a/src/ostree/ot-admin-builtin-upgrade.c
+++ b/src/ostree/ot-admin-builtin-upgrade.c
@@ -27,6 +27,7 @@
 #include "ot-admin-deploy.h"
 #include "ostree.h"
 #include "otutil.h"
+#include "libgsystem.h"
 
 #include <unistd.h>
 #include <stdlib.h>

diff --git a/src/ostree/ot-bootloader-syslinux.c b/src/ostree/ot-bootloader-syslinux.c
index 9fe6ae1a23dde940b9c278ffc6e31690de27e725..27eae45ff19e22f68c9c094cb4f8de3bfa0f347a 100644 (file)
--- a/src/ostree/ot-bootloader-syslinux.c
+++ b/src/ostree/ot-bootloader-syslinux.c
@@ -21,9 +21,9 @@
 #include "config.h"
 
 #include "ot-bootloader-syslinux.h"
-#include "libgsystem.h"
 #include "otutil.h"
 #include "ot-admin-functions.h"
+#include "libgsystem.h"
 
 #include <string.h>
 

diff --git a/src/ostree/ot-bootloader.c b/src/ostree/ot-bootloader.c
index 68ac223f3c4e326d9da911a4aec49ce77f271697..27edaa0af9196b688264f6278513674729c40b23 100644 (file)
--- a/src/ostree/ot-bootloader.c
+++ b/src/ostree/ot-bootloader.c
@@ -20,6 +20,7 @@
 
 #include "config.h"
 #include "ot-bootloader.h"
+#include "libgsystem.h"
 
 G_DEFINE_INTERFACE (OtBootloader, ot_bootloader, G_TYPE_OBJECT)
 

diff --git a/src/ostree/ot-builtin-admin.c b/src/ostree/ot-builtin-admin.c
index c591c0156bf0361b57543c61b046ef787e31345f..9b5bdc45ade076878f574a9c2a820fb596690811 100644 (file)
--- a/src/ostree/ot-builtin-admin.c
+++ b/src/ostree/ot-builtin-admin.c
@@ -28,6 +28,7 @@
 #include "ot-main.h"
 #include "ostree.h"
 #include "ostree-repo-file.h"
+#include "libgsystem.h"
 
 #include <glib/gi18n.h>
 

diff --git a/src/ostree/ot-builtin-cat.c b/src/ostree/ot-builtin-cat.c
index 357878eec2b9d6f74c682614b59fa188697013ea..c3f113f2e20e6a6d1258250415aef3812963377d 100644 (file)
--- a/src/ostree/ot-builtin-cat.c
+++ b/src/ostree/ot-builtin-cat.c
@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 #include <gio/gunixoutputstream.h>
 

diff --git a/src/ostree/ot-builtin-checkout.c b/src/ostree/ot-builtin-checkout.c
index 5691c71bab3d54092188268f884d0ae9df458ad3..c71592e769891fdfc2f4fc182694ee672a570c24 100644 (file)
--- a/src/ostree/ot-builtin-checkout.c
+++ b/src/ostree/ot-builtin-checkout.c
@@ -22,10 +22,12 @@
 
 #include "config.h"
 
+#include <string.h>
+#include <gio/gunixinputstream.h>
+
 #include "ot-builtins.h"
 #include "ostree.h"
-
-#include <gio/gunixinputstream.h>
+#include "otutil.h"
 
 static gboolean opt_user_mode;
 static gboolean opt_allow_noent;

diff --git a/src/ostree/ot-builtin-checksum.c b/src/ostree/ot-builtin-checksum.c
index d18121b12687b9ba7122727c6b9e4e84571510b5..aa82a9773fa16b05d67210f32bd1b653b3902078 100644 (file)
--- a/src/ostree/ot-builtin-checksum.c
+++ b/src/ostree/ot-builtin-checksum.c
@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "libgsystem.h"
 
 static GOptionEntry options[] = {
   { NULL }

diff --git a/src/ostree/ot-builtin-commit.c b/src/ostree/ot-builtin-commit.c
index facdee1be7a8420905a48e8ccdc33562587576c7..b29c229e67814d5af09758978ced50083a2b0208 100644 (file)
--- a/src/ostree/ot-builtin-commit.c
+++ b/src/ostree/ot-builtin-commit.c
@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 static char *opt_subject;
 static char *opt_body;

diff --git a/src/ostree/ot-builtin-config.c b/src/ostree/ot-builtin-config.c
index eb2766da7a1ff96bcf2a71c9f699133f207bbfc2..17707eef9cc2565cd12773a7cf0ed751dfdd5d8e 100644 (file)
--- a/src/ostree/ot-builtin-config.c
+++ b/src/ostree/ot-builtin-config.c
@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 static GOptionEntry options[] = {
   { NULL }

diff --git a/src/ostree/ot-builtin-diff.c b/src/ostree/ot-builtin-diff.c
index 0668609e81d31dd44649fa21c676dfd9f62d35e7..e335194c0187e6a07898c0a37b43ed596dd61d84 100644 (file)
--- a/src/ostree/ot-builtin-diff.c
+++ b/src/ostree/ot-builtin-diff.c
@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 static gboolean opt_stats;
 static gboolean opt_fs_diff;

diff --git a/src/ostree/ot-builtin-fsck.c b/src/ostree/ot-builtin-fsck.c
index 420921b77ddd8f014bfb830b7cb0227a09b1597b..e267415b565d63a365ed12a5ae5e43bc183062bf 100644 (file)
--- a/src/ostree/ot-builtin-fsck.c
+++ b/src/ostree/ot-builtin-fsck.c
@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 static gboolean opt_quiet;
 static gboolean opt_delete;

diff --git a/src/ostree/ot-builtin-init.c b/src/ostree/ot-builtin-init.c
index a992bfbd7ad6acc27d018f9641a2a7b2b5a08630..6d38899f577277a6ed5c5a1c7876dd93796960c6 100644 (file)
--- a/src/ostree/ot-builtin-init.c
+++ b/src/ostree/ot-builtin-init.c
@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "libgsystem.h"
 
 static gboolean opt_archive;
 static char *opt_mode = NULL;

diff --git a/src/ostree/ot-builtin-ls.c b/src/ostree/ot-builtin-ls.c
index 06087e48d9ab6b2f7a9b3704f0f247b8209ed093..3e016902667231e2869d087e641f706711adf3d7 100644 (file)
--- a/src/ostree/ot-builtin-ls.c
+++ b/src/ostree/ot-builtin-ls.c
@@ -25,6 +25,7 @@
 #include "ot-builtins.h"
 #include "ostree.h"
 #include "ostree-repo-file.h"
+#include "otutil.h"
 
 static gboolean opt_dironly;
 static gboolean opt_recursive;

diff --git a/src/ostree/ot-builtin-prune.c b/src/ostree/ot-builtin-prune.c
index 98fe9d6134e8581ba8c6ede473b7c5aadfa04e6a..6e2f07490afae651ef7f2c75c60f456fcf702883 100644 (file)
--- a/src/ostree/ot-builtin-prune.c
+++ b/src/ostree/ot-builtin-prune.c
@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "libgsystem.h"
 
 static gboolean opt_no_prune;
 static gint opt_depth = -1;

diff --git a/src/ostree/ot-builtin-pull-local.c b/src/ostree/ot-builtin-pull-local.c
index d99e2b8b7837f658e94e936f07a85767dc5d5a42..cd63450c67415aebc66ff1b8ac1b34658bdb8f8d 100644 (file)
--- a/src/ostree/ot-builtin-pull-local.c
+++ b/src/ostree/ot-builtin-pull-local.c
@@ -27,6 +27,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 static char *opt_remote;
 

diff --git a/src/ostree/ot-builtin-pull.c b/src/ostree/ot-builtin-pull.c
index a860625790c34244c8f4c461d419a8d4b07eafa5..1bb76357a456d78a3dd1691a746c834cf5e8de06 100644 (file)
--- a/src/ostree/ot-builtin-pull.c
+++ b/src/ostree/ot-builtin-pull.c
@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 gboolean opt_related;
 

diff --git a/src/ostree/ot-builtin-refs.c b/src/ostree/ot-builtin-refs.c
index eb3e8fcf190726a19b98e7479320b7ff74f98a91..972afe38d00774e20deed44213a67b7543069164 100644 (file)
--- a/src/ostree/ot-builtin-refs.c
+++ b/src/ostree/ot-builtin-refs.c
@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "libgsystem.h"
 
 static gboolean opt_delete;
 

diff --git a/src/ostree/ot-builtin-remote.c b/src/ostree/ot-builtin-remote.c
index 5a9964a23b7d3e80391a1e409670dcf44722fab5..76a63a3dfa31afce1040c0f60421369891737a06 100644 (file)
--- a/src/ostree/ot-builtin-remote.c
+++ b/src/ostree/ot-builtin-remote.c
@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 static GOptionEntry options[] = {
   { NULL }

diff --git a/src/ostree/ot-builtin-rev-parse.c b/src/ostree/ot-builtin-rev-parse.c
index 7d6eebdfceba04353682359da8ce174d29f11430..a1349a68360e0178d5200fb9d7de545fe01839ea 100644 (file)
--- a/src/ostree/ot-builtin-rev-parse.c
+++ b/src/ostree/ot-builtin-rev-parse.c
@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 static GOptionEntry options[] = {
   { NULL }

diff --git a/src/ostree/ot-builtin-show.c b/src/ostree/ot-builtin-show.c
index 8cc5e03d34828e38fcecfe5d64b0ee51e8772533..cbdce34c5642e0ef2786b70973d502e6f45f4466 100644 (file)
--- a/src/ostree/ot-builtin-show.c
+++ b/src/ostree/ot-builtin-show.c
@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 static gboolean opt_print_related;
 static char* opt_print_variant_type;

diff --git a/src/ostree/ot-builtin-trivial-httpd.c b/src/ostree/ot-builtin-trivial-httpd.c
index f3bd7cfff7962a04b86ae9a0256f95c5a3cc932a..d6f85f5d2d69ead77b433035cd701264ef348020 100644 (file)
--- a/src/ostree/ot-builtin-trivial-httpd.c
+++ b/src/ostree/ot-builtin-trivial-httpd.c
@@ -24,6 +24,7 @@
 
 #include "ot-builtins.h"
 #include "ostree.h"
+#include "otutil.h"
 
 static char *opt_port_file = NULL;
 static gboolean opt_daemonize;

diff --git a/src/ostree/ot-builtin-write-refs.c b/src/ostree/ot-builtin-write-refs.c
index b7e463b472e2844f331b9444c9ad4f420a257d99..b744d4250775d763792271acd3a8576570b5e2b9 100644 (file)
--- a/src/ostree/ot-builtin-write-refs.c
+++ b/src/ostree/ot-builtin-write-refs.c
@@ -22,12 +22,13 @@
 
 #include "config.h"
 
-#include "ot-builtins.h"
-#include "ostree.h"
-
 #include <gio/gunixoutputstream.h>
 #include <gio/gunixinputstream.h>
 
+#include "ot-builtins.h"
+#include "ostree.h"
+#include "otutil.h"
+
 static GOptionEntry options[] = {
   { NULL }
 };

diff --git a/src/ostree/ot-deployment.c b/src/ostree/ot-deployment.c
index 4f51b95f388abf4470f13218443030b0b330cd66..4956961e58ec75a4d3747fed3150e14981f04603 100644 (file)
--- a/src/ostree/ot-deployment.c
+++ b/src/ostree/ot-deployment.c
@@ -21,6 +21,7 @@
 #include "config.h"
 
 #include "ot-deployment.h"
+#include "libgsystem.h"
 
 struct _OtDeployment
 {

diff --git a/src/ostree/ot-main.c b/src/ostree/ot-main.c
index 590c1e33bd8c1227b66bc267bcc81d594b0aa1d4..243dfda171690b6f0b0d9009fb6fa76394db8921 100644 (file)
--- a/src/ostree/ot-main.c
+++ b/src/ostree/ot-main.c
@@ -28,6 +28,7 @@
 
 #include "ot-main.h"
 #include "otutil.h"
+#include "libgsystem.h"
 
 int
 ostree_usage (char **argv,

diff --git a/src/ostree/ot-ordered-hash.c b/src/ostree/ot-ordered-hash.c
index a7709e47e298bb46f89913b93eb1c5ea685b8a84..02c9e434ba3ebbe9de0d2a30f0cbe5d454be814e 100644 (file)
--- a/src/ostree/ot-ordered-hash.c
+++ b/src/ostree/ot-ordered-hash.c
@@ -21,6 +21,7 @@
 #include "config.h"
 
 #include "ot-ordered-hash.h"
+#include "libgsystem.h"
 
 OtOrderedHash *
 ot_ordered_hash_new (void)